We should have the ability to add / remove custom fields as we go. A good example would be this screenshot.