Generalized to hands other than assist and grade

I didn't know what I was doing when trying to update my fork to match yours... so I hope I didn't mess up. Would leave off the silly files if I knew how. Just tried to make your code I bit easier :)