supernova integration

I hope that this will be easier to merge.