I now have all the code tied together and arranged into header files