more B2 implementation work. Hacks now save to the config dir.