commting after 2 soft resets
threw away some ADDITIONAL changes when went to past and merged with origin
commit 1
sung 2
merged Lindleys