Snapping still only working one way...
Still not quite right... prepping for branch