Finished VERSION including Brian's shortcut for input