Add in grade selector
Resolve merge conflicts