Input handling, more tests passing