Some things changed.
Merge branch 'inputThings' into newApproach