move these to cpp file

I realize this is copy paste mostly, but we've since agreed to that standard.