[WIP] Working on the new architecture for the web services