Started integrating serverproxy