a little more cleanup about to branch
commit to merge in my methods