Train movement spec and fixed up the model so it can be used