Merge generally successful

moving on to making  expose jquery plugin