Little more work on the Maze stuff