End Combat Work

Begun work on End combat functionality.