vjr property refactoring, complete, but not yet tested or debugged