Major changes to support a basic 2-functional unit scheduler.