WIP - adding date picker and form to calendar