Pull new data structure and data commits

Tx Deathmax.. adapting code to new ID