Re-architecturing internal component. Work in progress non-functional.