The new CSPB Model
Merge branch 'master' of https://github.com/CSP-B/OnTrack