Started a refactor to avoid mapping backward too much.

INCOMPLETE
Continued styled string refactor.

INCOMPLETE