Added a few classes... Busy this week so I can't really work on this much.
Re-added some stuff. Oops.