This should be in a separate file. I can do that on merge.