VID-396 first round of feedback from design review addressed.