model + dao abstraction underway