Moved structs to header - TY JONO