Map display working; data storage still funky