finishing up the properties work