Maze rendering almost done
Merge