Build solution (6/30)

Build solution