Forms rework 1
minor progress
rc