Add saving/creating, untested but it compiles