Added ability to name locations and store time