Client Core and Main redone...