- Fix date handling
- Use input to populate form (needs tweaking)