Taking measures correctly

Next step: GUI