Initial master commit - base diagnostic viewer 8-16-13