Should be pretty easy after #164
Should be pretty easy after #164