Work in progress on #59