Started work on changes fpr WCF