Little more work on #37 and kick off re-usable version selector