New models to support the actual game play - with some tests (incomplete)