Jnf/moar copy

Fixes #37. Fixes #38. Gets us closer on #36.