Revert "More practise"

This reverts commit 3c5a19c838f6f6e1daba59dcc6b7dda190e49c24.
Changes to MainVC after mucked up merge attempt

This reverts commit 48586b7ecabef70b41049d70b373de6bd1e1da9b.

Conflicts:

RangeFinder.xcodeproj/project.xcworkspace/xcuserdata/chris.xcuserdatad/U
serInterfaceState.xcuserstate