Took out some junk files. Cleaning up.
Merge conflict