Removed auto-toggle
Merge remote-tracking branch 'origin/lights' into pickup
Basic implementation