Work towards #22