Moved automatic form tracking into its own file