Version prepped for code review (systems side).