added networking branch
conflicts fixed