Thanks. I think I'll wait till #360 is merged as conflicts are expected.