Started using struct extenders.  Removed let-struct