Prior to reorganization to hpp and cpp files