Working a bit more on the structs