Revert "More progress on work"

This reverts commit 154e0b83c0a2939f3de8a7804f64eb3a5f145ca0.