new layout, still needs encapsulation