Working #45: Did some refactoring to help with staff interface.