Final (hopefully) File Merge

The final (hopefully) merge of team files.