I'll take a closer look at R100 to see how they make it work. Currently I've merged the Drive and Ride skill into a Drive/Ride skill - Drive wagon and ride horse or other mount for historic/fantasy settings, Drive automobile or other motor vehicle and ride motorcycle for near historic/current/future settings. I'm also keeping the pilot skill - which can be specified for boat, flying beast, airplane, helicopter or spacecraft. I'm also currently keeping the Athletics skill as one skill, limited to a max skill of STR or DEX x5. I'll playtest this for some time and see how it works.