Begin to split day5 code out into files