cleaning up extension, working on v3 api