[WIP] Beta 6 changes

Work in progress, please don't merge yet :)