Working on v3, minor refactors to let everything compile