Substitute user for worker
Make graph a little more OO