Major forms rewrite
Updating forms to the new library
Changes for the GCC to be happy...