Patch Set 1: Looks good to me, approved; IP review completed

Not the cleanest solution but it works. In the future, we should consider cleaning up some of that repository based on project selection code...