Finished homework 6, working on extra credit now