Make the API more consistent
Implement source fragment bookmarks