Add TODO and more documentation