Models and DALs have been updated. Hopefully this will all unify into something functional when we're done.