WIP refactor limelight graph continued