Finished the Combat plugin