Tzinov - master merge

Doing this with Tzinov.
Performance-intensive being what--good performance-wise or bad performance-wise? Looks like we mainly have a bunch of strings flying around, which isn't the end of the world in python.