Ahodges/doc/doc1220

Fixes DOC-1220, add professional mode