Finished two-player functionality. Refactored classes for simplicity.