First version of controller input complete