Working on annotation saving… needs to be completed and cleaned up