Getting closer
Getting close on the refactor
Getting close on the refactor