Everything we need except for actually moving
Resolve Conflicts