first commit, having issues migrating Movement with needed columns