More work on breaking file into H and CPP