Commented some stuff to be able to compile and generate haddock to test it out