Initial work on updating the sample component.
Complete initial update of the sample component.