First pass and cleaning up scope usage.  Need to work on the CP EM integration.

USERGRID-148