Extended Shop Use Cases

Signed-off-by: jawillia <jawawilliams@gmail.com>