Fix/time and location

[Steven-McKelvey]

Replaces the time and location placeholders with functional storage of time (determined automatically) and location (using map) variables.