Got change handling/saving working