Refactoring to add interface so that I can do a proper unit test of
custom severities in its real environment
Intermediate status. Close to giving up
Maybe final commit