Changes to introduce bookmarks and related logic
Initial version
WIP
Last changes in dev
Final changes.