Even more input / controller work.