Work in progress (just main graph include/exclude working)