Completes Issue #3 - Bookmarks functional