Added ability to move bookmark.
Added TODO.