Work-in-progress to rewrite the internals.