Continuing WIP on multi-app

See the notes on d5f9faf