Revert Revert merge - add follow logic back in

This reverts commit 5e464448844a8b1381b2fed8532d20c2b6c6423d.

Conflicts:
	Pickle.xcodeproj/project.xcworkspace/xcshareddata/Pickle.xccheckout

Pickle.xcodeproj/project.xcworkspace/xcuserdata/dcgoss.xcuserdatad/UserI
nterfaceState.xcuserstate