Let's try stateful this time.
work in pogress...