Initial v2

Initial v2 currently used in production.