Worked on more structure. Currently there are no bugs