Initial v2 commit - work in progress.