initial bring-up for cm10.1 

rearranging things a bit