Do stuff to Location/

Add some methods, make some things more logical, add some Javadocs.