I merged all the classes. Had a bit of trouble doing it though. This code isn't clean or pretty, but it works for no. We really need to clean some stuff up, though.