adding swift, removing some junk