Much of the code is in the header files, removed some .cpps