Task 3 should be 100% complete, except for bugfixing