Strategy api v2

Agreed. Hope to look into this next.