initial rework

Signed-off-by: Wolf Noble <wnoble@datapipe.com>