Finishing up the controller.

- Last methods implemented.
- Note, two TODO comments raise some questions, please have a look.