Updated classes and stuff
Added rubrics