Updated TODO with goals