Finished OneStruct still need testing