Issue 34

Actually, I see why - that's part of core, so can't use it at this level... but maybe it needs to be in API instead?