Input Logic

I did start to change the input logic a bit.