Start adding in the mach-msm changes
Update: lib/