Working on editor (~75%)