Nebulae! And some refactoring.