Added Characters and stuff.
Merged a fuckload of conflicts.
Fixes and shit.
GOing with the flow.