Refactor service methods
Fix HQL shit (left join)
Start implementing grade overviews