Boot

Getting boot working and optimizing other stuff
Fixing merge conflicts