Server Logic updates (Nathan v 1.1