Import of files from prof. Yan

Stuff
Further import of files from prof. yan