prototyping new layout and flow, non sf pickups working without events, will be refactored after specs added