starting to reorg the juju to something more readable
it looks like this all works and its just that much more readable