refactor and task 1

Signed-off-by: Jeff Wells <jeff@jeffrwells.com>
phase 3 as done as it will be

Signed-off-by: Jeff Wells <jeff@jeffrwells.com>