Lab 2, Component Structure, Domain Model added