Cleanup, start fixing colours scale on other graphs
Accidentally implement entities dataset