Working 0616

@plapier: Moving forward I'll start breaking out tasks into branches for more concise pull requests.
what are all these copy files doing? Are they needed?