Moved more of the crud operations into a module