Updated TODO
Added labels to handles