Working. now to completely change it to SOA :-)