Display

Combat is displaying properly (I think).