Revert "Try this."

This reverts commit 5cd2ad8cc625666df9f11e33dcc099c301ba453d.
maybe I just fixed some bad juju
Fixed the bug
Some additions