Additional work towards saving functionality.