[WIP] Rewrite of PVR window integration