Putting stuff uncommented for testing back in