Start adding related structs work