Thesis-update

DONE
- Test #1

TODO
- everything else!!!