I believe this should be moved to the .cc file.