Graph makeover w/ aq statements

[niklas-gund]