More work on StructForm

might almost be usable now...