Giant refactor, all form ext in diff files now