Revert "Revert "In working progress""

This reverts commit 9faaab85a6cc9a011a5001e6bba5a91f39bb1501.