Major clean up...
new init
new init
new init