Features/san 193 line graph refactor

SAN-193 and SAN-208