7/22/14 -  Rewrote model data and calculate service in seperate files