Add controller and include wrong commits

Add editor controller