Check for days off

It looks kinda big, but most of that is code that's been moved around slightly