Refactored Input Types
Merge pull request #71 from nolanfilter/Nolan

Refactored Input Types