Add TODO and FUTURE comments