Ready for Walter to add server connections