More classed add and code split up

Code has yet to be modified, so at the moment game is not functional