Struct version 2

by David Richardson