Huge, huge checkpoint of refactoring the core data structures.