Remaining modules refactored.
Work in progress on some execution context bugs.