Working version

- update working version
- needs a number of examples to be viable