Initial implementation work-in-progress.