About to try and fix location storage