Started to add legacy to new architecture for Julian to style.