Added Tasks list

and lots of other changes