adding some TODO since i dont know yet how to TDD these parts of the code