Continued adding save support and changing getters and setters to properties