Added panes and upgraded to features 2.0