New combat system implemented, looks good, needs code clean-up.