More form work

Signed-off-by: Nick Hayday <nickhayday@mac.com>