Completed work on snapping grids

Closes #28
Closes #29