Updated Combat Unit

Not 100% done