Add snapping
Fix stuff