Finishing basic strategy and slight refactor