Porting my lighthouse-el over to CL