Added Wrappers.
Changed the "kind" of Controller to interface and added class BasicController.
Minor TODO changes.