More Structs. -res, more Tri

Affects #4 and #6