Sorted out the date picker - good enough