More DataHandler stuff. Location storage is done.