I think we need a few more bins and another shelf but we just about have all the hardware in proper organizers.