Feature/bookmark count

@bkeese can you take this change out since it doesn't seem crucial to the pull request?