Finished problem #009, minor edit to #007