added bikes and motorcycles, the code is more modular, fixed up the regex's to be smarter