Revert "Revert "Update to UserInput Class""

This reverts commit 96f00dc6b3a4594c50b4ffdfceee6dbace553cae.