Merge The Updated Systems Together

Just have to modify the AI to work with the battle system, then I can
start on the Game and views.