Made some yeah.
Merge conflict resolution hopefully