Combat/Char still a work in progress.
(so far.. its working.. but! had to be rewritten)
Merge remote-tracking branch 'origin/master'