Break a few more objects out and inject them instead