Ok. Figured out I was doing some dumb stuff. Remove unnessecary files and fleshed out some stuff into their own files.
Merging in