>> >> How do I fix this? >> Should I revert that whole merge? Oops, yeah revert the whole merge, I'll resend it with Aaron's suggestions to move things to the end of the structs. Sorry. Dave.