Gneralised some of the common functionality into the rest handler. See GIMI Experiment Serive for how much it simplifies things
A few minor tweaks. IP is not a stand-alone component