Unfinished work for #54