major reorganizing. started server stuff