WIP new version of the warehouse