Add save method, tests