thesis work
thesis refactoring and more text