Started integrating Component into Unit.