More work on the gather game code