HW8 - 69 passing

Hope to get the rest and refactor so it's readable tomorrow.