new changes

getting better not sure why its not in the right classes under each
other sigh....