Updated framework.  Still pretty messy. Added test game.