ghetto dependency injection?
fixes