Grade setup fleshed out