stripped out one-time-vars.  replaced with dicts

Now holds BPO data in dicts for easier access/dumping