safe.py could do with a re-write to use handler factory

[rsmith013]

Make safe.py more extensible by making a proper handler factory class to bring in the appropriate handler and harminise the handlers.