Wayland AC 2.4

WIP. Comments welcome.