New Architecture

Contains the latest architecture changes.