Project 4 complete; extra credit finished as well