Finished project with some extra credit