More parameterizing

Signed-off-by: Torrey Rice <rice@itorrey.com>