WIP extracted helper behavior to new class