Will redo this with the other and the refactoring of methods.