More OO design
Merge pull request #5 from abacon45/SecondGenetic

More OO design