Sorry git messed it up and could not merge the files. Ended up redoing what I could in client. The addition is action_diff()