Work on editing and saving targets