Results of Jesse Sprint 3

Mostly task changes. Bear in mind this modifies database, so a good idea to make a backup before running this.