Finished edit property functionlaity