Initial code additions.