Task 2 & 3 complete and functioning