Add save support
Add more stuff