added some input functionality and test objects