added location and stuff
did a bunch of shit. Can't remember it all