merge conflict resolved
stuff on kevin processing
days work
little script aws