Support it all through the main input.
Merge pull request #1 from boushley/master

Allow more input methods through the main box