adding features so I can export all this stuff.