Modifying from last project to get the basic sturcture