all dat stuff
Merged my stuff into master! Its about to get real.