Implement small piece of new architecture.