Made the day class simpler

Left all previous code within for comparison (or to potentially be
returned to)