Attempting to merge WebService repository into the official TaskCommander repo