Bookmarks v2

Second attempt at bookmarks and API refactor. Success!