Should we move this into the contrib directory? Maybe even the nova stuff should go in there.