Revert "Update to UserInput Class"

This reverts commit 3169eb6a0ba0893ed3fdf2f203f07847f0dd12cf.

Conflicts:
	bin/.gitignore