Polished off the game mechanic

Well, as much as possible!
I want to submit this as my first 'one game a month', for May. Just
need graphics then I'm good to go!