Better config and working my way through the grades functionality