adding task stuff, updating lots of other stuff