More fields, and gave up on dropdowns.