Input I

Input updated in Window class. Viewer deleted unnecessary bits