progress on #23