Finished ex7, testing now