DB still a work in progress