Bad news but this is going to have major conflicts with Roberto's JLayouts PR :(https://github.com/joomla/joomla-cms/pull/3231)