My Changes + Hartmans Changes

This is my changes + hartmans changes. Hartman was concerned about what order things were merged in because he didn't want to resolve merge conflicts, so I took care of that.

The only merge conflict was an import in conversation

If you merge hartmans change first then this pull request will automatically update to only show my changes as diffs. If you merge my change first then it will automatically merge hartmans stuff as well.

If you have any questions let me know