Moved more stuff over to characters.
Merge pull request #185 from Clashnia/various

Moved more stuff over to characters.