Partially built partially built new holding model/logic that aggregates various tranches of options for use in display and analysis.  Not yet done, but some of the data for the new model is in the DB.
Merge branch 'master' of heroku.com:blooming-bastion-4367