Thesis-update

DONE
- began with tests

TODO
- everything else!