modified swaps to be a more usable class
fixed merge conflict
added uploads to .gitignore, removed redundant migration