Commented out all of the code that's not working