Added some basic headers and cpp