WIP Cleaning up calculate default times shifts again