Changing to grid-based, adding spotlights