Thunderbolts

Merging thunderbolts with main repo...