Started a value functor refactor.