I think most of that stuff is already in SourceOP... or will be soon