Merge V2 into master

Still a bit incomplete, there's stuff to do.