Mergh

Freaking commit of the freaking main file that doesn;t want to ever work
out nice