near final work on #27