touch interface is starting to shape up. But now the test suite is broken :(