Gift for warhammer enthusiast

I’m looking to help my boyfriend organize his warhammer collection at home. What are some ideas for storage/display/organization? Right now everything is in cardboard boxes, I think it would be more enjoyable if it was easily accessible for him.