Uncomment a couple functions I had taken out for testing purposes