Added v2

Work in Progress, no changes yet.