update to structure.  added tests