Beginning to get Type Migration working

Checkpoint -- it is mostly working, but needs refactoring.