First pass at a more managable architecture.