db query builder todo added
model tests up