Added bookmarks and TODOs