Completed cleanup of globals. Next is to finish implementing locations.