Revert "Revert "Bookmark controller beta""

This reverts commit 21231412922ee75b252e8204695a7624d84eddb3.