Rewrote some models, changed to a new database