still working on the DB and ORM rewrite