added new structs for class. updated TODO list