Add ability to fine tune some of the json returned and did most of the work for adding metadata criteria to find services
fix conflicts