Updated loading and storing

Signed-off-by: Ryan Shofner <ryan@letsgolearn.com>