First step of rework. Switching to bait+switch style PCL design.