Rehash of Input system to be more inline with the separated instance design.