merged with current modified files from proptrak
merged, removing conflicts