Revert "#1 In Progress"

This reverts commit 945ef06f406a537232b5dee82ff06bb479f15067.