Moved everything from the .ipp file to the .h file