Move the c'tor into the cpp file