Almost done, menu structure in now to work on formatting