PVR building

ShevT: help me make it right!!! (until then it's commented out)