Still trying to fix the stupid nested dates