Basic bookmark implementation Closes #151