Complete overhaul, new editor