finished adding in thomas's tasks