Merge floor work and Music Effort

I worked to console the conflicts between my and Philips updates. This
should work.