updated the locomotive class to sort out the classification thingy
(agh!) and also ahve attached some preliminary test cases