vjr property refactoring, icomplete, but closer