Refactor to remove use of layout and work on peek and single.