Adding Current Class Structures / More to come