Cory

worked on migrations, it is time to merge