Working version with Web API instead of WCF
Cleanup