Refactoring some FormUI stuff.  None of this works yet.