Some work on the forms API