r16 Looking into removing/replacing inputs....

Dont like how I am doing it so far, need to delve deeper in.