Separated passenger logic from train heads.