Begginning of v2

Beggining of v2 development.