Revert "Initial commit of version that seems to be working well"

This reverts commit d3a80c91fc4b8403865ee70263042ac7a8c19853.