WIP -- basic db queries and need test