Add new struct, test on Ubu box now...