not sure what i'm doing. trying to reset to before cherry pick mess