[Ongoing]: Merge bueller back into jeweler

So far, rename complete, working on passing tests.

Future: rebase each commit from 1.5ish to current jeweler