Refactored supervisor application so it works more like the docs