Separation of Model Functions and Schemas

Main change includes how i handle queries.