Merge ppeditor in but still missing files and buggy