833 stacked area

Redirecting PR #851 to target develop branch
close #833 
I need to refactor... Whoops