Initial code check --  work in progress.