Controller.text updated

Controller.text updated to reflect controller that are pretty much done
but still need testing