Big update on CM7

Work done by Alberto96