Adding accuracy, speed to persistence
oops, opened in eclipse which messed up all whitespaace
More aggressive determination of stationaryLocation