A lot of changes and deleted pathfinding
Merge done