The Editor Update v1.1

This patch finishes the integration of code that Landon had written to
fix the CPU bug.