moved strategy stuff to Strategy class