Fixing Bug 1024087

you don't need this, it was just for an example -- use the structure in here you had before