Implemented loading and fixed saving