add form fields
add calculations and date count