Work in progress

Now saves and retrieves