Revert "Revert "more work""

This reverts commit 396abe0919f3e35ba567ed45e8e9c449c8aece41.