Some progress on #221