editor section done
yay conflicts. haaaaaands