Done. Went with CM7 first. Will try CM9 later.