I was planning to do this once v3 was available