Added code to test recent modifications/means of collecting input
Revert "Added code to test recent modifications/means of collecting input"

This reverts commit ad78ba39e61f794b8f9a99cf118d52f2f9d71726.
Merge origin/master