Added server, and stuff