Refactoring code across controllers and models
Finished refactoring tasks and groups. Moving on to bills
Fixed merge conflict