lots of old stuff + new jellyfish code