Rework PBR

Change-Id: I483e7dc9fdec069016d9fb6c76b84f18fcc9bff7
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>