would be nice, opened issue #516 for it for now since we can work on that after this is merged