Added stuff
More classes
Work
Still trying to figure out how things should work
Removed file
More stuff