Started better organizing editor in anticipation of modularization.