Change some copy stuff
More refactoring