Modifications for Jeremys benefit
removing db
Merge branch 'j2' into merge/master-j2
Making choices constants