Merging into one file so I can get it running
Continued shuffling
Fixing order of functions trying to get a compile