Added Activity and Rubric functionality

Also cleaned up some of the method  header crap