Move day logic into service. #117