Fixed strategy and helpers. Everything but Storage is working