sure, I'll rebase after #646 is merged