A few things commented out