GSM m7 builds now cohabitate.  CDMA still needs it's own place