Added basic server/client support (No network)