Added everything back. Brutal solution for the merge conflicts.