WIP: lamps sorta improved security