Major Overhaul to bring in some CM stuff

Change-Id: I45cb1bd095369ec36aa922a894c42d6befaf8179