refs #471

Move to a proper category