bugfixes + wip @ example
started implementing sagas