Loop over the entities just twice
Add function that just checks for collisions
Require proper aligning for docking