Now using dict to store tasks