Ok @jhoblitt . I'll wait for your PR to rebase it. Ok?