Given some much needed TLC... breaking up monolithic graph