[Feature] Authoring forms Re-Write
Merge with alexzen/forms