Architectural. Broke stuff out into different files.