Pretty Much Done

Still thinking about what might need to be added, when I create a new
branch called MatthewBranch or something it should be done.