Meh
Starting to refactor manager class