track some cm things people keep asking for
Merge pull request #1 from droyd/hybrid

Hybrid