Add TODO and missing features