Copy property refactoring

Hi Judy!

I think this code should be correct, but I haven't actually run it yet!  So do test it quick before merging.  :p

Looking forward to more code reduction!

-Steve