Added bookmarking, plus partial impl of registration