WIP - still fighting with supervisor. I'm seeing the end of the tunnel
though.