Add a little bit of stuff to support input later.