Work on Combat Testing

Getting Pretty close to something that actually works.