vjr property refactoring, incomplete