Project 4 commit 7

Complete through function 6