Expose the remote address via an interface which the Controller can implement
Add some TODO notes
Merge branch 'todo_notes'