Lots of copy modifications

Signed-off-by: Jake Bresnehan <jakebresnehan@gmail.com>