Initial commit. Sort of does stuff
Merging with Github