Moved form making back into its own class