TrainCarriages check-in

Merging to avoid problems later