HW06: Finished edits for HW06, could go back and put everything in functions, but I'm lazy