finished off Property class and integration of it