Added: walls and working collisions