Finished Input re-assignments.  Refactored Output enum, worked on java doc's, general refactoring of Convert.