fixed stuff
This is more fixed than before but not done
Renamed so I can organize the strategy section