Updated TODO and fixed forms so data works