Halfway through adding date picker