On the way to Page Manager (intermediate commit)