Revert "removing some other stuff and adding new controllers"

This reverts commit 31d39a8d4bde58171b1f4d1ef4af2d2b36ef261b.