Moving from .h to .cc