Fixes #29. Somethin something everything
SmartStrategy added for CPU among other things
Merge conflicts