the calendar thingy works, recognizes datepicker as a date not a nil
one more file saved since last commit
fixed merge conflicts