Reworked inputs to be stored by Location, not name