Progress on #2. Snap-to-cardinal-directions still doesn't work
Closes #2