Still broken, still trying to get departments into app-state