Merge struct inside of class
-Added ToDo's