lots of new stuff, still not testable
- to fix: shared values are not correct!