Form submission largely working
WIP checkin