Revert "Revert "Shelving Progress""

This reverts commit 6562467606699bb621dd43122c5325a77a6a1031.
Revert "Revert "Revert "Shelving Progress"""

This reverts commit b4fb3c051af4732a710fe3ccc9964e70d0f7b73b.