Working on sample out, flushing out some renaming errors