Added a bunch of jUnit Tests and coded (and refactored) quite a bit more. I go back and forth between some decisions, which wastes time. The basics start to be in good order, next I'll start graphics side.