#18 - support for train reinstatement
#18 - schema changes