Changed commands to use arguments. Rewriting location code, 70% complete
with adding location objectives.
Objective locations (initial testing)