Added server and basic peer