Updated for QoS, BoM, closer to completion