New Input Handler merged into Master Branch.