New/edit forms now populate properly

No saving yet, though.  Almost!