Progress on Input system