Rewrote the returnLoc HashMap to use UUIDs

Futureproofing