1st commit of pandora oxjs code merge of our code and Jay code 05-01-2014