Improve the model, add a DB loading class.