Interm commit. Further updates to integrate with reactjs.