First real commit

Fucked up yesterday and didn't commit changes