Work towards #21 and #26