Another great refactor...

Signed-off-by: oldmud0 <oldmud0@private.email>