Adding some initial strategies.
More cleanup.