This depends on #173 which is getting close to done