Revive beta

Needs testing

Do not merge in dev branch as-is