Version 10

* lots of work, forgot to do previous commits