added bookmarking...still needs some more work