Not working WIP
WIP fixing graphs