Input is done.
Fixed namespacing issues.
Merge branch 'input'