Simplifying to try and prevent timeouts and be closer to my use case

Signed-off-by: Gregg Coppen <gregg@iaminawe.com>