Jimmy c next hype

Merging before Aaron does.