Some integration

Integrated Sean's Characters, David's Combat, and Ben's Grid