oops fixed broken struct definition errors in last commit