New wrappers

This is duplicated. Probably worth making an abstract base class somewhere.