Add undo to Appraisals
Handle special cases
Integration specs
Merge remote-tracking branch 'origin/master'