Made some progress on being able to edit items...