More progress on #153