Finish up first pass at export command