Some reorganization
Attempting resolution of bookmark test failure
Attempting resolution of bookmark test failure
Added bookmarks, reformatted.
Add save capability