Added more classes and pretty much finished with adding things, just need to actually start implementing code to allow it to do things