[PD-dev] figuring out how to get everything merged