WIP - FVTK refactor/cleanup