added a grade model, cleaned scaffolding, added relations