DB and model currently separate

[Joshua-Hwang]

Would be nice to merge both the db class and model class into one.

[ldgrp]

It would be but they represent two different types-- the db class is the internal representation of the data, while the model class describes how this appears to the outside world (through the API).