Inital extra bed commit with back-compatibility

Needs review and permissions advice before continuing.