Interface cleanup
ff
Added a TODO
ff
ff
ff