Read only mode tim

Resubmission of #773 against new branch