More classes, emptied Main of non game stuff from testing period