First real commit

Merging shit like a real man