Tzinov - master merge

Doing this with Tzinov.
This is a very performance-intensive struct.