Uncommenting some stuff to see what is broken...