UnitInput Refactor
UnitInput Refactor