Undid a bunch of broken code in the WebService folder and fixed a bunch of reference issues caused by last commit.