Added first draft of new graph features 22