Adding more structure. Code is not functional at this point