Gridoverlay now works, and ready to be merged with master