Minor changes to data_model?
Merge branch 'master' of github.com:bikecomps/simulation
Got the basic simulation running