Rewrite basic objects and add test game