Consolidated Train Model calculations into 1 "update" method
Merge origin/master