Improve #3

Implements activities and grades