More work on refactor.

Signed-off-by: moose51789 <moose51789@gmail.com>