Pulling over what was need from EndGame
Merging Paul's Changes
Merging Paul's Changes
Merge pull request #38 from kwmcrell/master2

Master2