one_touch stuff edits now in GIT