Fixed TODOs
We add interfaces for the input and the output