Revert "Some Progress"

This reverts commit ce59758851811b20e99db97193a2777226a332bf.