Started on new bookmark/resume code.