Beginning to peel away the duplicated code.