Reworking NameTagServices to Bean...in progress