Updated TODO's in MainActivity