broken. refactoring like mad. 'add' works, 'change' up next. save point.