Working on refactoring bookmarks.