Added partially functioning saving features