More input stuff

This should have been included with the last commit.