Resending pull for Edge Snap

@kscottz  Please close the last one and let me know if this is fine !