Adding Warehouse Layer, still not fully working