Added boilerplate code and stubs for new architecture.