Mid end

While we're at it, we can begin reviewing the Mid-end changes, if there are any different from the UI ones.