Stuff
Tons of refactoring. Now with more bootstrap