Need to refactor all of the code
Need to refactor all of the code