Wrote more tests, renamed helpers to service, refactored views to call service for all db interaction, all raw queries go in the service package and a collection of raw queries