Refactor

Proper separation of concerns.   Helpers in lib where interacting with the DB which is the model's domain.