WIP for the new game - have a long way to go though...