Finished up the Combat portion