Slight update to include time picker. Needs more work...