Added TODO
This should work, but breaks tests

**UNTESTED**