snappoints, works but not ready for release

Change-Id: I4acd7054af942be6efee88c042ec92d5d32741f8