Graeme's new classes. Should work.