Fixing forms handling and beginning to test them.