New data model for reference points, starting round differently, aiming pulling reference points
Merge remote-tracking branch 'origin/master'