Tentative v2 build with refactor