complete migration
Merge pull request #27 from Eric-Brison/4

complete migration