Complete handling of property description -- need to test still