Resolving nesting issues.  #15