Beginning to make struct structure more clear. Will finish tests then build upon structure.