Revert "Revert "Revert "added new forms"""

This reverts commit ade58562629f344b0ee2cdf65a695b3074d56e88.