Finished more on the model, started introducing things into the gui