Major code changes, need debug testing

eom

Signed-off-by: Robert Tipton <tret@tretflix.com>