Add Form1099Int, with some refactoring