Working towards the answer with Rich
sort of working
Merge branch 'dev' of https://github.com/Waderoni/RideAlong into dev