+ properties edit rework but not finished