Working out some architectural details