Basic structure/ added connor's class files