WIP : More Inplace edit