Added Combat stage

Just need to do the outcome stuff...