Updated Task 3.1

Still need to do a final review of both.