Comments added, still working on the webservice part