working on implementing observerinput, pushing to continue work on other computer
fixed conflicts