I'll clean it up even more, I wanna have DI in place.