should there be more nesting here? something seems off.