Data Storage Done

Bottom echos are for testing, remove when ready