Eek. Finished my HW1 refactor.