All of my tests passing. Need to refactor.