Revert "mistake on last committ"

This reverts commit 591167cdeb870f7e6224b455eac1aa5f1b8c7dfb.
Revert "Revert "mistake on last committ""

This reverts commit 84209845874da7c0d90d5d6ff9337956ab2a9bdc.
Revert "Cleaned some things up"

This reverts commit 1f5422164bb266d40fb00147b8ebe0d84b0823ce.