WIP: Added some more Inits and debug points