Working on Adopters. First of many changes