Work on gamestate & templates