Merge Branch: Server side setup and service