Juno support

IN PROGRESS.

Creating a PR to make it a little simpler to see what was added.