Some changes to formatting of shape names and partial implementation of property VC
Completed Property VC