Moved code out of header files and into cpp files