Initial commit of new thesis version