Started adding component-based architecture