Passing all final tests, work on extra credit