Add experimental edit in place feature