Date Picker working, hopefully this doesn't break everything