Move header code to cpp