Indeed a huge improvement, we do need some changes but we are certainly getting there! Will do more testing later.

Make dwh able to be used as a hammer for the storage