WiP: User lamps

Refactoring some internal parts on how to discover and save lamps