Added subsequent days; started consolidation into functions