typedef changes + actually builds now
typedef convention