Maze working re-commit...