Added grades and TODOs to the rest.